deprecate GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST, GTK_CHECK_GET_CLASS,

2008-06-17  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktypeutils.h: deprecate GTK_CHECK_CAST,	GTK_CHECK_CLASS_CAST,
	GTK_CHECK_GET_CLASS, GTK_CHECK_TYPE and GTK_CHECK_CLASS_TYPE.
	Move the GtkType typedef to an undeprecated section.

svn path=/trunk/; revision=20428

diff --git a/ChangeLog b/ChangeLog
index 7c94df7d0bdd2665837ff7ad0d1781732a805828..d1bf575124ee616382c83599aa407ea117c770a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-17  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtktypeutils.h: deprecate GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST,
+       GTK_CHECK_GET_CLASS, GTK_CHECK_TYPE and GTK_CHECK_CLASS_TYPE.
+       Move the GtkType typedef to an undeprecated section.
+
 2008-06-17  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkprogress.h: use G_TYPE macros for type checking instead

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 8802ed91ef6344eaf2c65af92a964d6e550d51e4..4333ceedef9e87569bbb29626d38b399aa262e99 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -79,8 +79,6 @@ typedef GType GtkFundamentalType;
 #define        GTK_FUNDAMENTAL_TYPE    G_TYPE_FUNDAMENTAL
 #define GTK_STRUCT_OFFSET      G_STRUCT_OFFSET
 
-#endif /* GTK_DISABLE_DEPRECATED */
-
 /* glib macro wrappers (compatibility) */
 #define        GTK_CHECK_CAST          G_TYPE_CHECK_INSTANCE_CAST
 #define        GTK_CHECK_CLASS_CAST    G_TYPE_CHECK_CLASS_CAST
@@ -90,10 +88,6 @@ typedef GType GtkFundamentalType;
 
 /* glib type wrappers (compatibility) */
 
-typedef GType                  GtkType;
-
-#ifndef GTK_DISABLE_DEPRECATED
-
 typedef GTypeInstance          GtkTypeObject;
 typedef GTypeClass             GtkTypeClass;
 typedef GBaseInitFunc          GtkClassInitFunc;
@@ -141,6 +135,11 @@ typedef GSignalCMarshaller          GtkSignalMarshaller;
 #endif
 
 #if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+
+/* glib type wrappers (compatibility) */
+
+typedef GType GtkType;
+
 /* Used by gtk_container_foreach_unmarshal () */
 
 /* GtkArg, used to hold differently typed values */